merge trunk
authorKenichi Handa <handa@etlken>
Mon, 26 Jul 2010 04:29:08 +0000 (13:29 +0900)
committerKenichi Handa <handa@etlken>
Mon, 26 Jul 2010 04:29:08 +0000 (13:29 +0900)
commit322f14a516b7865f4314cfe1f9c7f1a014e91f4f
treeb07b1446ebca7ab7bbb422496e309ca624e4737a
parentdbdc49e70bd5cd1d22bd1c2e2f8d760a0a603346
parent24d97be4b3aba9b06f4a334ac4816a39e27aea44
merge trunk
src/ChangeLog
src/font.c